wayland: fix rename of wl_shell to xdg_shell

Regression from 9127087e1c0e93f94552f0ad5170d4dfa785146a

diff --git a/docs/reference/gdk/gdk3-sections.txt b/docs/reference/gdk/gdk3-sections.txt
index c0962ffd157fa0e2183674452f0c873cafc5dfc3..d602d4b40d49c4565ff092d382291ae6dfccd49d 100644 (file)
--- a/docs/reference/gdk/gdk3-sections.txt
+++ b/docs/reference/gdk/gdk3-sections.txt
@@ -1162,8 +1162,7 @@ gdk_wayland_device_get_wl_pointer
 gdk_wayland_device_get_wl_seat
 gdk_wayland_display_get_wl_compositor
 gdk_wayland_display_get_wl_display
-gdk_wayland_display_get_wl_shell
-gdk_wayland_window_get_wl_shell_surface
+gdk_wayland_display_get_xdg_shell
 gdk_wayland_window_get_wl_surface
 gdk_wayland_window_set_use_custom_surface
 

diff --git a/gdk/wayland/gdkwaylanddisplay.h b/gdk/wayland/gdkwaylanddisplay.h
index 35107199232006414b11f661eb091038139b1081..b2e7d5a4c70a967414dc18ef736a50744d123073 100644 (file)
--- a/gdk/wayland/gdkwaylanddisplay.h
+++ b/gdk/wayland/gdkwaylanddisplay.h
@@ -50,7 +50,7 @@ struct wl_display      *gdk_wayland_display_get_wl_display      (GdkDisplay *dis
 GDK_AVAILABLE_IN_ALL
 struct wl_compositor   *gdk_wayland_display_get_wl_compositor   (GdkDisplay *display);
 GDK_AVAILABLE_IN_ALL
-struct wl_shell        *gdk_wayland_display_get_wl_shell        (GdkDisplay *display);
+struct xdg_shell       *gdk_wayland_display_get_xdg_shell       (GdkDisplay *display);
 GDK_AVAILABLE_IN_3_10
 void                    gdk_wayland_display_set_cursor_theme    (GdkDisplay  *display,
                                                                  const gchar *theme,

diff --git a/gdk/wayland/gdkwindow-wayland.c b/gdk/wayland/gdkwindow-wayland.c
index 839b9a04966688d7b0c451b36a5192e6ae98a33f..7407d5c4016f421bfc149e63a301a3eccc15b6f6 100644 (file)
--- a/gdk/wayland/gdkwindow-wayland.c
+++ b/gdk/wayland/gdkwindow-wayland.c
@@ -2266,7 +2266,7 @@ gdk_wayland_window_get_wl_surface (GdkWindow *window)
  *
  * A good example would be writing a panel or on-screen-keyboard as an
  * out-of-process helper - as opposed to having those in the compositor
- * process. In this case the underlying surface isn't a wl_shell
+ * process. In this case the underlying surface isn't an xdg_shell
  * surface and the panel or OSK client need to identify the wl_surface
  * as a panel or OSK to the compositor. The assumption is that the
  * compositor will expose a private interface to the special client